merge
authorIan Campbell <ian.campbell@xensource.com>
Thu, 1 Feb 2007 16:55:45 +0000 (16:55 +0000)
committerIan Campbell <ian.campbell@xensource.com>
Thu, 1 Feb 2007 16:55:45 +0000 (16:55 +0000)

Trivial merge